From: Katsumi Yamaoka Date: Thu, 25 Nov 2010 05:09:25 +0000 (+0000) Subject: mml.el (mml-preview): Make sure to bind gnus-displaying-mime to nil, assuming that... X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5537 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fc3dab125751ff8fb2dbf8e330f605ac0bda8177;p=emacs.git mml.el (mml-preview): Make sure to bind gnus-displaying-mime to nil, assuming that article displaying or another mml-preview may be interrupted for an error or for the like. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ea875f8bda1..c60d7680c1d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,9 @@ 2010-11-25 Katsumi Yamaoka + * mml.el (mml-preview): Make sure to bind gnus-displaying-mime to nil, + assuming that article displaying or another mml-preview may be + interrupted for an error or for the like. + * shr.el (shr-get-background): Fix argument name. 2010-11-24 Lars Magne Ingebrigtsen diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 7314675e6f8..7dc6b76afae 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -1509,7 +1509,8 @@ or the `pop-to-buffer' function." (mm-disable-multibyte) (insert s))) (let ((gnus-newsgroup-charset (car message-posting-charset)) - gnus-article-prepare-hook gnus-original-article-buffer) + gnus-article-prepare-hook gnus-original-article-buffer + gnus-displaying-mime) (run-hooks 'gnus-article-decode-hook) (let ((gnus-newsgroup-name "dummy") (gnus-newsrc-hashtb (or gnus-newsrc-hashtb